package com.hwz;

public class Hello {
    public static void main(String[] args) {
        System.out.println("hello2 for 3.0");
        //手动解决冲突
        System.out.println("hi for master");
        System.out.println("hi for 3.0");
        System.out.println("hi2 for 3.0");
    }
}
